Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor for new docker api plugin #882

Merged

Conversation

pjdarton
Copy link
Member

Take advantage of DelegatingDockerClient that's now present in https://github.com/jenkinsci/docker-java-api-plugin/releases/tag/3.1.5-31.v70b0ca3e8310

This should (hopefully) loosen the tight dependency between the docker-java-api-plugin and this plugin, allowing the docker-java-api-plugin to change the version of docker-java in use without breaking this plugin entirely.

 - Maybe it's because of a new mockito, or because I used a new JVM, but
this test code failed, complaining that it couldn't mock a private
interface.
 - This version contains its own DelegatingDockerClient implementation,
which will mean we don't have to have our own version.
@pjdarton
Copy link
Member Author

@ericcitaire I've tried this locally and it passes unit-tests on my local machine ... but I don't have any spare time right now to do anything more in depth than that.
Please test this and determine if this will be enough to enable you to make changes to the docker-java-api-plugin without breaking this one.
If it looks good then I'll push out a release.

... and then that should make it safe for you to make "brave" changes to the docker-java-api-plugin without fear of breaking this one 😁

@pjdarton pjdarton merged commit 13f6d01 into jenkinsci:master Apr 14, 2022
@ericcitaire
Copy link
Contributor

@pjdarton I made some basic tests on a Jenkins with both docker-java-api-plugin v3.1.5-31.v70b0ca3e8310 and this one installed. Everything looks OK.

LGTM.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants